Skip to content

Merge devel into master#310

Merged
amcadmus merged 20 commits into
deepmodeling:masterfrom
amcadmus:master
Jun 15, 2022
Merged

Merge devel into master#310
amcadmus merged 20 commits into
deepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus

Copy link
Copy Markdown
Member

No description provided.

amcadmus and others added 20 commits April 21, 2022 08:00
…eepmodeling#277)

A system will be able to be labeled by other drivers after they are implemented.
```
DeprecationWarning: Please use `R` from the `scipy.constants` namespace, the `scipy.constants.constants` namespace is deprecated.
    from scipy.constants.constants import R
```

Co-authored-by: Han Wang <amcadmus@gmail.com>
The code read the electronic energy instead of the total SCF energy. This commit fixes it.
* add ML labeling option for vasp ml-aimd OUTCAR

* add test cases for ML labeling OUTCAR

* Update vasp.py

* Update vasp.py

* Update outcar.py

* merge functions of ML labeling and fp labeling

* add and delete necessary comments

* Update outcar.py
Before, only single-point calculation output is supported.
The shape of energies should be (nframes,) instead of (nframes, 1)
…g#290)

deepmodeling#190 added `from_labeled_system`, but it just passes a dict and does nothing else. This commit rewrites it.
Now it is avoided to open the same file multiple times.
otherwise they are not listed in the doc
* add data type; refactor methods

* add DataType to manage types of data
* refactor data checking to check type and shape of data
** fix incorrect data type in some codes
* refactor methods including sub_system, append, sort_atom_types, shuffle, pick_atom_idx, and merge methods in LabeledSystem into those in System

* small fix

* fix the shape of formal_charges. Looks like the docstring is wrong

* remove wrong import

* fix system class in sub_system
…eepmodeling#301)

* adapt abacus/md interface to MD output without stress calculation.

* add unit test for abacus md without stress output.

* Add files via upload

* add assertion failed reason for abacus/md interface

Co-authored-by: LiuRenxi <liurenxi@LiuRenxideMacBook-Pro.local>
* add ase calculator

* add ASEDriver

* add ase_calculator property
* adapt abacus/md interface to MD output without stress calculation.

* add unit test for abacus md without stress output.

* Add files via upload

* add unlabeled read and dump interface for ABACUS STRU format.

* add assertion failed reason for abacus/md interface

* fix open file method

* fix typo; introduce np.testing in abacus tests.

* remove useless if clause

Co-authored-by: LiuRenxi <liurenxi@LiuRenxideMacBook-Pro.local>
@codecov-commenter

codecov-commenter commented Jun 15, 2022

Copy link
Copy Markdown

Codecov Report

Merging #310 (856fa77) into master (7029230) will increase coverage by 0.62%.
The diff coverage is 83.53%.

@@            Coverage Diff             @@
##           master     #310      +/-   ##
==========================================
+ Coverage   81.48%   82.11%   +0.62%     
==========================================
  Files          61       63       +2     
  Lines        5143     5429     +286     
==========================================
+ Hits         4191     4458     +267     
- Misses        952      971      +19     
Impacted Files Coverage Δ
dpdata/unit.py 88.15% <ø> (ø)
dpdata/plugins/amber.py 64.40% <33.33%> (-21.31%) ⬇️
dpdata/plugins/deepmd.py 62.50% <45.83%> (-31.38%) ⬇️
dpdata/driver.py 86.36% <86.36%> (ø)
dpdata/system.py 84.65% <87.71%> (+4.56%) ⬆️
dpdata/plugins/ase.py 74.32% <90.24%> (+8.86%) ⬆️
dpdata/ase_calculator.py 92.59% <92.59%> (ø)
dpdata/abacus/scf.py 91.10% <97.61%> (+3.43%) ⬆️
dpdata/abacus/md.py 99.01% <100.00%> (+3.46%) ⬆️
dpdata/amber/sqm.py 98.85% <100.00%> (+0.02%) ⬆️
... and 16 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7029230...856fa77. Read the comment docs.

@amcadmus amcadmus merged commit 64805b9 into deepmodeling:master Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants